Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 02:23:07 +0000 (19:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 30 Oct 2011 02:23:07 +0000 (19:23 -0700)
commite9be2199b25ab2ecc28928553a443cb0ff57ad2a
treed95e9fe930e35864dbd317530df80a873aa6537a
parent03e41df147baf11d5cd83557d3603c1e736c9f3e
parent83fa3ba5fc946eaa6c8369773f852da00c01561b
Merge from trunk.